Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

AIP 6: Security council Elections #87

Merged
merged 716 commits into from
Sep 6, 2023
Merged

AIP 6: Security council Elections #87

merged 716 commits into from
Sep 6, 2023

Conversation

DZGoldman
Copy link
Collaborator

@DZGoldman DZGoldman commented Jul 5, 2023 •
edited by fredlacs
Loading

implementation of Security Council elections
https://forum.arbitrum.foundation/t/aip-6-security-council-elections/15425

this includes fixes from audit reports produced by Trail of Bits and Code4Rena

@DZGoldman DZGoldman mentioned this pull request Jul 11, 2023
Closed
@gzeoneth gzeoneth self-requested a review July 12, 2023 08:23
gzeoneth
gzeoneth reviewed Jul 13, 2023
View reviewed changes
Copy link
Collaborator

@gzeoneth gzeoneth left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

some small suggestions

src/security-council-mgmt/governors/SecurityCouncilNomineeElectionGovernor.sol Outdated Show resolved Hide resolved
test/security-council-mgmt/SecurityCouncilMemberElectionGovernorCountingUpgradeable.t.sol Outdated Show resolved Hide resolved
src/security-council-mgmt/SecurityCouncilManager.sol Show resolved Hide resolved
src/security-council-mgmt/SecurityCouncilManager.sol Outdated Show resolved Hide resolved
src/security-council-mgmt/SecurityCouncilManager.sol Show resolved Hide resolved
src/UpgradeExecRouterBuilder.sol Outdated Show resolved Hide resolved
@godzillaba
enforce manager updates ordering
ad5a933
@godzillaba
...
087d9b8
@godzillaba
comments on member counting
aaab983
@godzillaba
test topNominees gas
d96f453
@godzillaba
remove console log
8028307
@godzillaba
update topNominees gas comment
013d8ed
@godzillaba
lint and snapshot
08ed4ba
@godzillaba
general kv store
5d7deb6
@godzillaba
make UpgradeActionStorage.computeKey public
6f3ad74
@godzillaba
Merge pull request #151 from ArbitrumFoundation/security-council-mgmt…
4de3e97 
…--topnominees-gas

create test for measuring gas use of topNominees()
@godzillaba
separate files
6db1029
@godzillaba
cannot createElection until previous member election has executed
1e19c86
@godzillaba
governors comments
d489703
@godzillaba
more governors comments
397b98d
@godzillaba
comments ISecurityCouncilManager
11e1cbb
@godzillaba
remove unused interface
f0efa56
@godzillaba
comments security-council-mgmt
085bfa8
@godzillaba
comments done
fcb2bfa
@godzillaba
add a comment
5e23e97
@godzillaba
...
d1c0511
@godzillaba
Merge pull request #154 from ArbitrumFoundation/security-council-mgmt…
85ac4ef 
…--gov-ordering

cannot createElection until previous member election has executed [exploratory]
@godzillaba
minor updates
7fb0c9e
@godzillaba
...
53b978d
@godzillaba
rename to ExecutionRecord
861f148
DZGoldman and others added 17 commits August 15, 2023 18:53
@DZGoldman
config env vars in mainnet.ts
65dcbc3
@DZGoldman
fix upgradeExecutor chain verification
ad847d9
@DZGoldman
mainnet deployment json
fdf138c
@DZGoldman
Merge pull request #195 from ArbitrumFoundation/security-council-mgmt…
c933573 
…--proposal-description

add sc election proposal description
@DZGoldman
Merge branch 'security-council-mgmt--base' into security-council-mgmt…
45ee2b3 
…--delpoyment
@DZGoldman
generate proposal data json
bc4ccfe
@yahgwai
Fix snapshot
4befeba
@yahgwai
Merge branch 'security-council-mgmt--base' into security-council-mgmt…
c63744a 
…--delpoyment
@DZGoldman
use /tree in github link in proposal description
6f8f412
@yahgwai
Set immutable constitution hash, and renamed text to aip 5
0e62898
@yahgwai
Renamed dir structure
5fa7d26
@yahgwai
Formatting
cda138a
@yahgwai
Updated snapshot
bf96988
@godzillaba
redeploy arbOne activation
de17a8a
@yahgwai
Updated gas snapshot
9e2e4cd
@yahgwai
Updated proposal data
d61af72
@DZGoldman
Merge pull request #198 from ArbitrumFoundation/security-council-mgmt…
949b303 
…--delpoyment

Security council election contracts: mainnet deployment!
@DZGoldman DZGoldman marked this pull request as ready for review August 16, 2023 19:11
@fredlacs fredlacs changed the title Security council Elections: base mega-branch AIP 6: Security council Elections Aug 18, 2023
fredlacs
fredlacs approved these changes Sep 6, 2023
View reviewed changes
Copy link
Contributor

@fredlacs fredlacs left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@DZGoldman DZGoldman merged commit 449f548 into main Sep 6, 2023
8 checks passed
@fredlacs fredlacs deleted the security-council-mgmt--base branch September 6, 2023 19:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@gzeoneth gzeoneth gzeoneth left review comments

@fredlacs fredlacs fredlacs approved these changes

@godzillaba godzillaba godzillaba approved these changes

@yahgwai yahgwai yahgwai approved these changes

Assignees
No one assigned
Labels
security-council-elections
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@DZGoldman @yahgwai @godzillaba @fredlacs @gzeoneth